Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 10 Jul 2011 04:54:04 +0000 (21:54 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 10 Jul 2011 04:54:04 +0000 (21:54 -0700)
commit98f7e6e51ca05b1e758a2d6ba2b1ecc953f3e7ad
treea7595e74c4fe4f5c2294e0a5e44c7e87bfa2a2cb
parent890887e9ce76f52346e3c1758b9c2a8b2d8b930b
parent68e03baaa3e11416f9d488bbf56612330f31bbcd
Merge from trunk.
src/ChangeLog